Merged fixed conflict