merge and fix conflicts