Fixed .proj file after merging conflicts