style changes
fixed merged conflicts