reverted the merge errors