Removed merge conflict code from when I tried to pull changes to develop beforehand