Fixed small bug and removed merge-errors