Still resolving git conflict