removed extra files
fixed conflict
completed merge