Deleted extra lines added when merging through git