Edited merge form for best practices