Removed all merge remnants (oops)