Checking for conflicts added
Local vars not yet supported