changes for new, edit page of devise
resolve merge conflict
changes for athlete