- added : main element integrated
 - fixed : conflicts