fixed messy merge