reset --hard my changes and merge from CM