fixed uncaught merge conflict