synced what sud and i had. we pushed and changed at the same time and it made a mess but it's fixed now