It turned out that the proposal I was trying to pull was corrupt because of a missing file-ending. I thought the errors were some sort of conflict, but they weren't.