commit merge
failing tests finished
fixed merge Conflicts