Updated publications
Solved some conflicts