before merge
merge conflicts resolved