moved commit to different branch, created conflict now resolution