and another merge
Project setting update