fixing issues with branch before merge