Third fork

Why am I always facing with merge conflicts