fixed my merge problems - I am bad.