succesful manual merge..maybe