Adds missing javadoc and applies some renamings
Adds initial support of conflict detection for equal inserted lines