Fix smart indent and merge conflict