further testing
fixed merge conflict
file does not seem to be committing...