cleanup/resolve git conflicts???