Fixed merge for real this time