Performing a slightly dodgy merge