updated asynchronous call to synchronous call
fix merge conflict