resolve conflict
fix layout not found error