merge conflicts fixing, please
