merge after added in conflict
 merged in pull request and fixed conflicts