cleaning up my conflict files and hopefully not wrecking anything more