Fixed issues with merge