merging
fixing merge conflict on oufile