resolving git conflict