Bugfix & changed order of merge again