Reverted merging errors