Remove extra comma
Resolve conflicts