revert some merging conflicts