Very small adjustments
Solved conflict