Merge messup fix