Deleted warnings
Solved conflicts