commit before merge
fixed merge conflicts