Fixed a conflict that occured when justin synced