cleaning up random merge