Added notice for end of cfp
Fixed merge conflict