Deleted file causing pull conflicts