Resolving git conflict