modified b
merged issue removed conflicts