Conflict in a branch with master

Question

I created two branches for new features both taken from master.

Branch A

Branch B

I did Pull Reques