new update from 2 for msater
resolve conflicts