finish resolve conflicts, also fixed tiles-conf.xml problem.