fix issues with merge