Third time is the charm

Conflict fixed :)