Fix merge & format code