Finally got the fucking offset working
merge conflict resolution