commitBeforeMergingWithYasmin
conflict resloved