merge conflicts fixed