Fixed merge conflicts and HoundCI style.