minor styling \changes
resolved conflict