commiting a file from mac iterm
5.54 fixing conflicts