Got deleted while resolvingmerge conflicts