reformatting things
fixing merge