Fixed merge for feedback