pendulum
dealing with merge issues <JLK>