master branch conflict and reset and commit all files again