Fixed merge commits for real this time