[master] Bug fixes in conditional statements
[master] Solving conflicts