Refactored merge form rendering to a more sensible way