updated merge conflicts and fixed files