Reverted errors in merge