Remove git messup, fix duplicated file