pull/merge conflicts fixed