First commit is default
Fixed merge