Not sure why but storyboard keeps getting modified so commiting to see if I can get it to stop.
Fixed merge conflict.