changed funky files
resolving conflicts