small fix, conflicts resolved