solved some merging errors from git