fixed mergederp... :O