added some perldoc
resolved conflict