fixed merging conflicts