merge tidy up