mess 3rd line by user1
resolve merge by user 1