This is just to resolve conflicts; this code might not work
Resolving conflicts