Try to easy merging upstream:master task