added file formatter
fixed merge conflict