Please merge my code

Please !!!!