fixed proj file from merge conflict