before merge
conflicts solved