style conflict merge
style conflict merge 2