final push frontend
more changes
latest version of project
resolving merge conflict