standardize readme
resolve conflicts