last merge conflicts fixed