Regular merge issues using GitHub