added files
resolve merge conflict of schedule.java