Apply changes from main