conflicts resolved after merging lal pull request