Add some tests and starts implementation of merging
Implementation Alpha
typo
something bad happens here
pull merge fix
something less bad
something less bad 2
add authentication of admins for the merge form
Fixed the comments