Remove git merge character indicator
Run docker build, save and push