cleaning code base for submission
fixed conflict