Fixing Git conflict problems
Fixed problems with Git conflicts