user validation from authentication token done
minor conflicts removed