[Docker] Fixed merge conflicts.