merging conflicts fixed